Merge pull request #103 from darksidelemm/main

Update solar elevation calculations

Author: darksidelemm

js/format.js

@@ -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);
                     }
 
 

js/suncalc.js

@@ -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; }
@@ -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,
@@ -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
     };
 };