Skip to content

Commit

Permalink
Run styler
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikemahoney218
mikemahoney218 committed Oct 21, 2020
1 parent b905b80 commit cef5f75
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 51 deletions.
6 changes: 4 additions & 2 deletions R/classes.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,10 @@ terrainr_bounding_box <- function(bl, tr, coord_units = "degrees") {
bl <- tr
tr <- swap
} else {
stop("The given coordinates don't seem to be ",
"the bottom left and upper right corners.")
stop(
"The given coordinates don't seem to be ",
"the bottom left and upper right corners."
)
}
methods::new("terrainr_bounding_box",
bl = bl,
Expand Down
56 changes: 35 additions & 21 deletions R/get_tiles.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ get_tiles <- function(bbox,
replacements <- which(services %in% names(list_of_services))
services[replacements] <- as.vector(
list_of_services[services[replacements]]
)
)
}

services <- unique(services)
Expand All @@ -145,9 +145,11 @@ get_tiles <- function(bbox,

tl <- terrainr::terrainr_coordinate_pair(c(bbox@tr@lat, bbox@bl@lng))
img_width <- round(terrainr::calc_haversine_distance(tl, bbox@tr),
digits = 0)
digits = 0
)
img_height <- round(terrainr::calc_haversine_distance(tl, bbox@bl),
digits = 0)
digits = 0
)

x_tiles <- ceiling(img_width / side_length)
y_tiles <- ceiling(img_height / side_length)
Expand All @@ -159,31 +161,43 @@ get_tiles <- function(bbox,

for (i in 1:x_tiles) {
if (i == x_tiles) {
left_lng <- terrainr::point_from_distance(bbox@bl,
side_length * (i - 1),
90)@lng
left_lng <- terrainr::point_from_distance(
bbox@bl,
side_length * (i - 1),
90
)@lng
right_lng <- bbox@tr@lng
} else {
left_lng <- terrainr::point_from_distance(bbox@bl,
side_length * (i - 1),
90)@lng
right_lng <- terrainr::point_from_distance(bbox@bl,
side_length * i,
90)@lng
left_lng <- terrainr::point_from_distance(
bbox@bl,
side_length * (i - 1),
90
)@lng
right_lng <- terrainr::point_from_distance(
bbox@bl,
side_length * i,
90
)@lng
}
for (j in 1:y_tiles) {
if (j == y_tiles) {
top_lat <- terrainr::point_from_distance(bbox@tr,
side_length * (j - 1),
180)@lat
top_lat <- terrainr::point_from_distance(
bbox@tr,
side_length * (j - 1),
180
)@lat
bot_lat <- bbox@bl@lat
} else {
top_lat <- terrainr::point_from_distance(bbox@tr,
side_length * (j - 1),
180)@lat
bot_lat <- terrainr::point_from_distance(bbox@tr,
side_length * j,
180)@lat
top_lat <- terrainr::point_from_distance(
bbox@tr,
side_length * (j - 1),
180
)@lat
bot_lat <- terrainr::point_from_distance(
bbox@tr,
side_length * j,
180
)@lat
}

tile_boxes[[i]][[j]] <- list(
Expand Down
32 changes: 20 additions & 12 deletions R/merge_rasters.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,26 @@ merge_rasters <- function(input_rasters,
}

total_extent <- raster::raster(raster::extent(
min(vapply(input_raster_objects,
function(x) raster::extent(x)@xmin,
numeric(1))),
max(vapply(input_raster_objects,
function(x) raster::extent(x)@xmax,
numeric(1))),
min(vapply(input_raster_objects,
function(x) raster::extent(x)@ymin,
numeric(1))),
max(vapply(input_raster_objects,
function(x) raster::extent(x)@ymax,
numeric(1)))
min(vapply(
input_raster_objects,
function(x) raster::extent(x)@xmin,
numeric(1)
)),
max(vapply(
input_raster_objects,
function(x) raster::extent(x)@xmax,
numeric(1)
)),
min(vapply(
input_raster_objects,
function(x) raster::extent(x)@ymin,
numeric(1)
)),
max(vapply(
input_raster_objects,
function(x) raster::extent(x)@ymax,
numeric(1)
))
))
raster::projection(total_extent) <- raster::projection(input_raster_objects[[1]]) # nolint

Expand Down
25 changes: 14 additions & 11 deletions R/raster_to_raw_tiles.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ raster_to_raw_tiles <- function(input_file,
output_prefix,
side_length = 4097,
raw = TRUE) {

input_raster <- raster::raster(input_file)
max_raster <- raster::cellStats(input_raster, "max")

Expand Down Expand Up @@ -66,18 +65,22 @@ raster_to_raw_tiles <- function(input_file,
for (i in seq_along(x_tiles)) {
for (j in seq_along(y_tiles)) {
if (any(grepl("progressr", utils::installed.packages()))) {
p(message = sprintf("Cropping tile (%d,%d)",
x_tiles[[i]],
y_tiles[[j]]))
p(message = sprintf(
"Cropping tile (%d,%d)",
x_tiles[[i]],
y_tiles[[j]]
))
}
gdalUtils::gdal_translate(input_file, temptiffs[[counter]],
srcwin = paste0(x_tiles[[i]],
", ",
y_tiles[[j]],
", ",
side_length,
", ",
side_length)
srcwin = paste0(
x_tiles[[i]],
", ",
y_tiles[[j]],
", ",
side_length,
", ",
side_length
)
)
names(temptiffs)[[counter]] <- paste0(
output_prefix,
Expand Down
7 changes: 4 additions & 3 deletions tests/testthat/test-1-raster_to_raw_tiles.R
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
test_that("raster_to_raw runs without errors", {

outputs <- raster_to_raw_tiles(
input_file = "testdata/merge_rasters_test.tif",
output_prefix = tempfile(),
side_length = 4097,
raw = FALSE
)

expect_equal(png::readPNG(outputs[[1]]),
png::readPNG("testdata/raster_to_raw_1.png"))
expect_equal(
png::readPNG(outputs[[1]]),
png::readPNG("testdata/raster_to_raw_1.png")
)

expect_error(
raster_to_raw_tiles(
Expand Down
6 changes: 4 additions & 2 deletions tests/testthat/test-classes.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ test_that("classes are stable", {
expect_warning(terrainr_coordinate_pair(c(44.04905, -74.01188)))
expect_equal(
terrainr_coordinate_pair(c(lat = 44.04905, lng = -74.01188)),
terrainr_coordinate_pair(deg_to_rad(c(lat = 44.04905, lng = -74.01188)),
"radians")
terrainr_coordinate_pair(
deg_to_rad(c(lat = 44.04905, lng = -74.01188)),
"radians"
)
)

expect_equal(
Expand Down

0 comments on commit cef5f75

Please sign in to comment.