frodovdr/node-red-nodes
1
0
Fork 0
mirror of https://github.com/node-red/node-red-nodes.git synced 2023-10-10 13:36:58 +02:00
Code Issues Releases Wiki Activity

better fix for handling of high latitudes

Browse Source 
to close #1002 again
This commit is contained in:
Dave Conway-Jones 2023-05-28 09:58:12 +01:00
parent ddaa9b24b8
commit 0342a4b7ae
No known key found for this signature in database
GPG Key ID: 1DDB0E91A28C2643
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
time/timeswitch/package.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "node-red-node-timeswitch", "name" : "node-red-node-timeswitch",
"version" : "1.1.0", "version" : "1.1.1",
"description" : "A Node-RED node to provide a simple timeswitch to schedule daily on/off events.", "description" : "A Node-RED node to provide a simple timeswitch to schedule daily on/off events.",
"dependencies" : { "dependencies" : {
"spacetime": "^7.4.3", "spacetime": "^7.4.3",

32
time/timeswitch/timeswitch.js
View File

@ -47,13 +47,17 @@ module.exports = function (RED) {
// all sun events for the given lat/long // all sun events for the given lat/long
const sunEvents = SunCalc.getTimes(nowNative, node.lat, node.lon); const sunEvents = SunCalc.getTimes(nowNative, node.lat, node.lon);
const sunAlt = SunCalc.getPosition(nowNative, node.lat, node.lon).altitude; const sunAlt = SunCalc.getPosition(nowNative, node.lat, node.lon).altitude;
let sunriseDateTime = spacetime(sunEvents[SUNRISE_KEY]).nearest("minute"); var sunriseDateTime = spacetime(sunEvents[SUNRISE_KEY]).nearest("minute");
let sunsetDateTime = spacetime(sunEvents[SUNSET_KEY]).nearest("minute"); var sunsetDateTime = spacetime(sunEvents[SUNSET_KEY]).nearest("minute");
var aday if (sunEvents[SUNRISE_KEY] == "Invalid Date") {
if (sunEvents[SUNRISE_KEY] == "Invalid Date" || sunEvents[SUNSET_KEY] == "Invalid Date") { if (sunAlt >= 0) { sunriseDateTime = now.startOf("day"); }
if (sunAlt >= 0) { aday = 1; } else { sunriseDateTime = now.endOf("day"); }
else { aday = 0; } }
if (sunEvents[SUNSET_KEY] == "Invalid Date") {
if (sunAlt >= 0) { sunsetDateTime = now.endOf("day"); }
else { sunsetDateTime = now.startOf("day"); }
} }
// add optional sun event offset, if specified // add optional sun event offset, if specified
@ -63,13 +67,15 @@ module.exports = function (RED) {
// check if sun event has already occurred today // check if sun event has already occurred today
if (now.isAfter(sunriseDateTime)) { if (now.isAfter(sunriseDateTime)) {
// get tomorrow's sunrise, since it'll be different // get tomorrow's sunrise, since it'll be different
sunriseDateTime = spacetime(SunCalc.getTimes(now.add(1, "day").toNativeDate(), node.lat, node.lon)[SUNRISE_KEY]).nearest("minute"); // sunriseDateTime = spacetime(SunCalc.getTimes(now.add(1, "day").toNativeDate(), node.lat, node.lon)[SUNRISE_KEY]).nearest("minute");
sunriseDateTime = sunriseDateTime.add(1, "day");
// add optional sun event offset, if specified (again) // add optional sun event offset, if specified (again)
sunriseDateTime = sunriseDateTime.add(Number(node.sunriseOffset), "minutes"); sunriseDateTime = sunriseDateTime.add(Number(node.sunriseOffset), "minutes");
} }
if (now.isAfter(sunsetDateTime)) { if (now.isAfter(sunsetDateTime)) {
// get tomorrow's sunset, since it'll be different // get tomorrow's sunset, since it'll be different
sunsetDateTime = spacetime(SunCalc.getTimes(now.add(1, "day").toNativeDate(), node.lat, node.lon)[SUNSET_KEY]).nearest("minute"); // sunsetDateTime = spacetime(SunCalc.getTimes(now.add(1, "day").toNativeDate(), node.lat, node.lon)[SUNSET_KEY]).nearest("minute");
sunsetDateTime = sunsetDateTime.add(1, "day");
// add optional sun event offset, if specified (again) // add optional sun event offset, if specified (again)
sunsetDateTime = sunsetDateTime.add(Number(node.sunsetOffset), "minutes"); sunsetDateTime = sunsetDateTime.add(Number(node.sunsetOffset), "minutes");
} }
@ -210,16 +216,6 @@ module.exports = function (RED) {
return; return;
} }
if (proceed && aday === 1) {
sendPayload(1);
return;
}
if (proceed && aday === 0) {
sendPayload(0);
return;
}
// if the chronological order is NOW --> ON --> OFF, then now should be OFF // if the chronological order is NOW --> ON --> OFF, then now should be OFF
if (proceed && selectedOffTime.isAfter(selectedOnTime)) { if (proceed && selectedOffTime.isAfter(selectedOnTime)) {
sendPayload(0, selectedOnTime); sendPayload(0, selectedOnTime);