Skip to content

Include possibility to find Sun time based on a given altitude. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Include possibility to find Sun time based on a given altitude. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f9bab7
Include possibility to find Sun time based on a given altitude.
tuberculo Mar 20, 2021
04d3c98
Invert order of custom1 and custom2.
tuberculo Mar 20, 2021
8e07c62
Set 45 as the default custom altitude.
tuberculo Mar 20, 2021
4899c18
Update README.md
tuberculo Apr 12, 2021
92c08ab
Merge pull request #1 from datastorm-open/master
tuberculo Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions R/calcFunctions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
}

# calculates sun times for a given date and latitude/longitude
.getTimes <- function(date, lat, lng) {
.getTimes <- function(date, lat, lng, alt) {

rad <- (pi / 180)
lw <- rad * -lng
Expand Down Expand Up @@ -156,7 +156,9 @@
nightEnd = .fromJulian(Jnoon - (.getSetJ(-18 * rad, lw, phi, dec, n, M, L) - Jnoon)),
night = .fromJulian(.getSetJ(-18 * rad, lw, phi, dec, n, M, L)),
goldenHourEnd = .fromJulian(Jnoon - (.getSetJ(6 * rad, lw, phi, dec, n, M, L) - Jnoon)),
goldenHour = .fromJulian(.getSetJ(6 * rad, lw, phi, dec, n, M, L))
goldenHour = .fromJulian(.getSetJ(6 * rad, lw, phi, dec, n, M, L)),
custom1 = .fromJulian(Jnoon - (.getSetJ(alt * rad, lw, phi, dec, n, M, L) - Jnoon)),
custom2 = .fromJulian(.getSetJ(alt * rad, lw, phi, dec, n, M, L))
)

return(result)
Expand Down
8 changes: 4 additions & 4 deletions R/getSunlightTimes.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
getSunlightTimes <- function(date = NULL, lat = NULL, lon = NULL, data = NULL,
keep = c("solarNoon", "nadir", "sunrise", "sunset", "sunriseEnd", "sunsetStart",
"dawn", "dusk", "nauticalDawn", "nauticalDusk", "nightEnd", "night",
"goldenHourEnd", "goldenHour"),
tz = "UTC"){
"goldenHourEnd", "goldenHour", "custom1", "custom2"),
tz = "UTC", alt = 45){


# data control
Expand All @@ -77,13 +77,13 @@ getSunlightTimes <- function(date = NULL, lat = NULL, lon = NULL, data = NULL,
# variable control
available_var <- c("solarNoon", "nadir", "sunrise", "sunset", "sunriseEnd", "sunsetStart",
"dawn", "dusk", "nauticalDawn", "nauticalDusk", "nightEnd", "night",
"goldenHourEnd", "goldenHour")
"goldenHourEnd", "goldenHour", "custom1", "custom2")
stopifnot(all(keep %in% available_var))

# date := lubridate::force_tz(lubridate::as_datetime(Sys.Date()) + lubridate::hours(12), Sys.timezone())
data <- data %>%
.[, date := lubridate::force_tz(lubridate::as_datetime(date) + lubridate::hours(12), Sys.timezone())] %>%
.[, (available_var) := .getTimes(date = date, lat = lat, lng = lon)] %>%
.[, (available_var) := .getTimes(date = date, lat = lat, lng = lon, alt = alt)] %>%
.[, c("date", "lat", "lon", keep), with = FALSE] %>%
.[, date := as.Date(date)] %>%
as.data.frame()
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
````
# from cran
install.packages("suncalc")
devtools::install_github("datastorm-open/suncalc") for developpement version
devtools::install_github("tuberculo/suncalc") for version from this repo.
````

# Use
Expand Down