Skip to content

Commit 6842754

Browse files
committed
Fix lidar rooftop tool error
1 parent 3e365df commit 6842754

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

PY2R/automation.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ def function_header(line):
2525
line = line.replace("self, i,", "input,")
2626
line = line.replace("self, i=None,", "input,")
2727
line = line.replace("self, output, i=None,", "input, output,")
28+
line = line.replace(', i=None,', ', input=None,')
2829
line = line.replace("self, ", "")
2930
line = line.replace("callback=None", "wd=NULL, verbose_mode=FALSE")
3031
line = line.replace("False", "FALSE")

PY2R/scripts/lidar_analysis.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,13 +1235,13 @@ wbt_lidar_remove_outliers <- function(input, output, radius=2.0, elev_diff=50.0,
12351235
#'
12361236
#' @return Returns the tool text outputs.
12371237
#' @export
1238-
wbt_lidar_rooftop_analysis <- function(buildings, output, i=NULL, radius=2.0, num_iter=50, num_samples=10, threshold=0.15, model_size=15, max_slope=65.0, norm_diff=10.0, azimuth=180.0, altitude=30.0, wd=NULL, verbose_mode=FALSE) {
1238+
wbt_lidar_rooftop_analysis <- function(buildings, output, input=NULL, radius=2.0, num_iter=50, num_samples=10, threshold=0.15, model_size=15, max_slope=65.0, norm_diff=10.0, azimuth=180.0, altitude=30.0, wd=NULL, verbose_mode=FALSE) {
12391239
wbt_init()
12401240
args <- ""
12411241
args <- paste(args, paste0("--buildings=", buildings))
12421242
args <- paste(args, paste0("--output=", output))
1243-
if (!is.null(i)) {
1244-
args <- paste(args, paste0("--i=", i))
1243+
if (!is.null(input)) {
1244+
args <- paste(args, paste0("--input=", input))
12451245
}
12461246
if (!is.null(radius)) {
12471247
args <- paste(args, paste0("--radius=", radius))

R/lidar_analysis.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,13 +1235,13 @@ wbt_lidar_remove_outliers <- function(input, output, radius=2.0, elev_diff=50.0,
12351235
#'
12361236
#' @return Returns the tool text outputs.
12371237
#' @export
1238-
wbt_lidar_rooftop_analysis <- function(buildings, output, i=NULL, radius=2.0, num_iter=50, num_samples=10, threshold=0.15, model_size=15, max_slope=65.0, norm_diff=10.0, azimuth=180.0, altitude=30.0, wd=NULL, verbose_mode=FALSE) {
1238+
wbt_lidar_rooftop_analysis <- function(buildings, output, input=NULL, radius=2.0, num_iter=50, num_samples=10, threshold=0.15, model_size=15, max_slope=65.0, norm_diff=10.0, azimuth=180.0, altitude=30.0, wd=NULL, verbose_mode=FALSE) {
12391239
wbt_init()
12401240
args <- ""
12411241
args <- paste(args, paste0("--buildings=", buildings))
12421242
args <- paste(args, paste0("--output=", output))
1243-
if (!is.null(i)) {
1244-
args <- paste(args, paste0("--i=", i))
1243+
if (!is.null(input)) {
1244+
args <- paste(args, paste0("--input=", input))
12451245
}
12461246
if (!is.null(radius)) {
12471247
args <- paste(args, paste0("--radius=", radius))

docs/pkgdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ pandoc: 2.10.1
22
pkgdown: 1.5.1
33
pkgdown_sha: ~
44
articles: []
5-
last_built: 2020-09-04T18:30Z
5+
last_built: 2020-09-04T19:44Z
66

docs/reference/wbt_lidar_rooftop_analysis.html

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/wbt_lidar_rooftop_analysis.Rd

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)