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

Fix for suncalc for non UTC timezones

Browse Source 
Thanks to @pmscientist
This commit is contained in:
dceejay 2015-03-07 20:36:22 +00:00
parent 5b6cca1dd0
commit 7307891aee
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
time/79-suncalc.js
View File

@ -30,15 +30,12 @@ module.exports = function(RED) {
this.tick = setInterval(function() { this.tick = setInterval(function() {
var now = new Date(); var now = new Date();
var hour = now.getUTCHours();
var mins = now.getUTCMinutes();
var times = SunCalc.getTimes(now, node.lat, node.lon); var times = SunCalc.getTimes(now, node.lat, node.lon);
var hour1 = times[node.start].getUTCHours(); var nowMillis = Date.UTC(now.getUTCFullYear(),now.getUTCMonth(),now.getUTCDate(),now.getUTCHours(),now.getUTCMinutes());
var mins1 = times[node.start].getUTCMinutes(); var startMillis = Date.UTC(times[node.start].getUTCFullYear(),times[node.start].getUTCMonth(),times[node.start].getUTCDate(),times[node.start].getUTCHours(),times[node.start].getUTCMinutes());
var hour2 = times[node.end].getUTCHours(); var endMillis = Date.UTC(times[node.end].getUTCFullYear(),times[node.end].getUTCMonth(),times[node.end].getUTCDate(),times[node.end].getUTCHours(),times[node.end].getUTCMinutes());
var mins2 = times[node.end].getUTCMinutes(); var e1 = nowMillis - startMillis;
var e1 = (hour*60+mins) - (hour1*60+mins1); var e2 = nowMillis - endMillis;
var e2 = (hour*60+mins) - (hour2*60+mins2);
var moon = parseInt(SunCalc.getMoonIllumination(now).fraction*100+0.5)/100; var moon = parseInt(SunCalc.getMoonIllumination(now).fraction*100+0.5)/100;
var msg = { payload:0, topic:"sun", moon:moon }; var msg = { payload:0, topic:"sun", moon:moon };
if ((e1 > 0) & (e2 < 0)) { msg.payload = 1; } if ((e1 > 0) & (e2 < 0)) { msg.payload = 1; }

4
time/package.json
View File

@ -1,9 +1,9 @@
{ {
"name" : "node-red-node-suncalc", "name" : "node-red-node-suncalc",
"version" : "0.0.5", "version" : "0.0.6",
"description" : "A Node-RED node to provide a signal at sunrise and sunset", "description" : "A Node-RED node to provide a signal at sunrise and sunset",
"dependencies" : { "dependencies" : {
"suncalc" : "1.5.*" "suncalc" : "1.6.*"
}, },
"repository" : { "repository" : {
"type":"git", "type":"git",