Skip to content

Update solar elevation calculations #103

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

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Update solar elevation calculations #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion js/format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ function formatData(data) {

// For WSPR payloads, calculate solar elevation.
if(wspr_payload){
dataTempEntry.data['solar_elevation'] = (SunCalc.getPosition(stringToDateUTC(dataTempEntry.gps_time), dataTempEntry.gps_lat, dataTempEntry.gps_lon).altitude/rad).toFixed(1);
dataTempEntry.data['solar_elevation'] = (SunCalc.getPosition(stringToDateUTC(dataTempEntry.gps_time), dataTempEntry.gps_lat, dataTempEntry.gps_lon, dataTempEntry.gps_alt).altitude/rad).toFixed(1);
}


Expand Down
6 changes: 4 additions & 2 deletions js/suncalc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ var dayMs = 1000 * 60 * 60 * 24,
J1970 = 2440588,
J2000 = 2451545;

var earthradm = 6371008.8; // earth mean radius in meters

function suncalc_toJulian(date) { return date.valueOf() / dayMs - 0.5 + J1970; }
function suncalc_fromJulian(j) { return new Date((j + 0.5 - J1970) * dayMs); }
function suncalc_toDays(date) { return suncalc_toJulian(date) - J2000; }
Expand Down Expand Up @@ -61,7 +63,7 @@ var SunCalc = {};

// calculates sun position for a given date and latitude/longitude

SunCalc.getPosition = function (date, lat, lng) {
SunCalc.getPosition = function (date, lat, lng, ht) {

var lw = rad * -lng,
phi = rad * lat,
Expand All @@ -72,7 +74,7 @@ SunCalc.getPosition = function (date, lat, lng) {

return {
azimuth: suncalc_azimuth(H, phi, c.dec),
altitude: suncalc_altitude(H, phi, c.dec)
altitude: suncalc_altitude(H, phi, c.dec) + acos(earthradm / (earthradm + ht)) // adjust to horizon at altitude - From Steve Randall
};
};