add earth curvature and refraction correction to cartesian_to_polar()

adokter · adokter · commit 820e85f956fa · 2019-04-01T15:39:07.000-04:00
diff --git a/R/project_as_ppi.R b/R/project_as_ppi.R
@@ -195,8 +195,8 @@ proj_to_wgs <- function(x, y, proj4string) {
   return(res)
 }
 
-cartesian_to_polar <- function(coords, elev = 0) {
-  range <- sqrt(coords[, 1]^2 + coords[, 2]^2) / cos(elev)
+cartesian_to_polar <- function(coords, elev = 0, k = 4/3, lat = 35, re = 6378, rp = 6357) {
+  range <- beam_range(sqrt(coords[, 1]^2 + coords[, 2]^2),elev,k=k, lat=lat, re=re, rp=rp)
   azim <- (0.5 * pi - atan2(coords[, 2], coords[, 1])) %% (2 * pi)
   data.frame(range = range, azim = azim * 180 / pi)
 }

Original file line number	Diff line number	Diff line change
`@@ -195,8 +195,8 @@ proj_to_wgs <- function(x, y, proj4string) {`
`195`	`195`	`return(res)`
`196`	`196`	`}`
`197`	`197`
`198`		`-cartesian_to_polar <- function(coords, elev = 0) {`
`199`		`- range <- sqrt(coords[, 1]^2 + coords[, 2]^2) / cos(elev)`
	`198`	`+cartesian_to_polar <- function(coords, elev = 0, k = 4/3, lat = 35, re = 6378, rp = 6357) {`
	`199`	`+ range <- beam_range(sqrt(coords[, 1]^2 + coords[, 2]^2),elev,k=k, lat=lat, re=re, rp=rp)`
`200`	`200`	`azim <- (0.5 * pi - atan2(coords[, 2], coords[, 1])) %% (2 * pi)`
`201`	`201`	`data.frame(range = range, azim = azim * 180 / pi)`
`202`	`202`	`}`