update dependencies

This commit is contained in:
Matt Walsh 2022-03-01 15:40:43 -06:00
parent 4c3ace6395
commit d0509f14ae
6 changed files with 2229 additions and 2694 deletions

2942
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -19,8 +19,8 @@
"devDependencies": { "devDependencies": {
"del": "^6.0.0", "del": "^6.0.0",
"ejs": "^3.1.5", "ejs": "^3.1.5",
"eslint": "^7.17.0", "eslint": "^8.10.0",
"eslint-config-airbnb-base": "^14.2.1", "eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.22.1",
"express": "^4.17.1", "express": "^4.17.1",
"gulp": "^4.0.2", "gulp": "^4.0.2",
@ -33,7 +33,7 @@
"gulp-terser": "^2.0.0", "gulp-terser": "^2.0.0",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"jquery-touchswipe": "^1.6.19", "jquery-touchswipe": "^1.6.19",
"luxon": "^1.25.0", "luxon": "^2.3.1",
"nosleep.js": "^0.12.0", "nosleep.js": "^0.12.0",
"suncalc": "^1.8.0", "suncalc": "^1.8.0",
"swiped-events": "^1.1.4" "swiped-events": "^1.1.4"

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

View file

@ -125,6 +125,7 @@ function approxTransit(Ht, lw, n) { return J0 + (Ht + lw) / (2 * PI) + n; }
function solarTransitJ(ds, M, L) { return J2000 + ds + 0.0053 * sin(M) - 0.0069 * sin(2 * L); } function solarTransitJ(ds, M, L) { return J2000 + ds + 0.0053 * sin(M) - 0.0069 * sin(2 * L); }
function hourAngle(h, phi, d) { return acos((sin(h) - sin(phi) * sin(d)) / (cos(phi) * cos(d))); } function hourAngle(h, phi, d) { return acos((sin(h) - sin(phi) * sin(d)) / (cos(phi) * cos(d))); }
function observerAngle(height) { return -2.076 * Math.sqrt(height) / 60; }
// returns set time for the given sun altitude // returns set time for the given sun altitude
function getSetJ(h, lw, phi, dec, n, M, L) { function getSetJ(h, lw, phi, dec, n, M, L) {
@ -135,13 +136,18 @@ function getSetJ(h, lw, phi, dec, n, M, L) {
} }
// calculates sun times for a given date and latitude/longitude // calculates sun times for a given date, latitude/longitude, and, optionally,
// the observer height (in meters) relative to the horizon
SunCalc.getTimes = function (date, lat, lng) { SunCalc.getTimes = function (date, lat, lng, height) {
height = height || 0;
var lw = rad * -lng, var lw = rad * -lng,
phi = rad * lat, phi = rad * lat,
dh = observerAngle(height),
d = toDays(date), d = toDays(date),
n = julianCycle(d, lw), n = julianCycle(d, lw),
ds = approxTransit(0, lw, n), ds = approxTransit(0, lw, n),
@ -152,7 +158,7 @@ SunCalc.getTimes = function (date, lat, lng) {
Jnoon = solarTransitJ(ds, M, L), Jnoon = solarTransitJ(ds, M, L),
i, len, time, Jset, Jrise; i, len, time, h0, Jset, Jrise;
var result = { var result = {
@ -162,8 +168,9 @@ SunCalc.getTimes = function (date, lat, lng) {
for (i = 0, len = times.length; i < len; i += 1) { for (i = 0, len = times.length; i < len; i += 1) {
time = times[i]; time = times[i];
h0 = (time[0] + dh) * rad;
Jset = getSetJ(time[0] * rad, lw, phi, dec, n, M, L); Jset = getSetJ(h0, lw, phi, dec, n, M, L);
Jrise = Jnoon - (Jset - Jnoon); Jrise = Jnoon - (Jset - Jnoon);
result[time[1]] = fromJulian(Jrise); result[time[1]] = fromJulian(Jrise);

View file

@ -75,6 +75,7 @@
var eventData = { var eventData = {
dir: eventType.replace(/swiped-/, ''), dir: eventType.replace(/swiped-/, ''),
touchType: (changedTouches[0] || {}).touchType || 'direct',
xStart: parseInt(xDown, 10), xStart: parseInt(xDown, 10),
xEnd: parseInt((changedTouches[0] || {}).clientX || -1, 10), xEnd: parseInt((changedTouches[0] || {}).clientX || -1, 10),
yStart: parseInt(yDown, 10), yStart: parseInt(yDown, 10),