Made some additional tweaks to rain detection script

Author: gvdhoven

README.md

@@ -24,6 +24,10 @@ $ npm install node-red-contrib-dutch-weather
 
 For all nodes, you'll need to create at least one configuration. Drag one of the exposed nodes to your flow and set it up just like all other config nodes. After that, you can use the event emitters in your own code.
 
+## Release 2.0.6
+
+* After some time the rain-node was not giving any output anymore; the time in between working and not varies from various minutes to hours. Previously the script required both Buienradar and Meteoplaza to respond with a valid response when asking for the current rain state; this is changed so that only 1 of the systems would need to provide accurate values.
+
 ## Release 2.0.3
 
 * `dutch-weather-sun-position` (and) `dutch-weather-solar-events` **removed**: There is a much better node-red node you can use: [node-red-contrib-sun-position](https://flows.nodered.org/node/node-red-contrib-sun-position/)

lib/WeatherLogic.js

@@ -93,18 +93,30 @@ class WeatherLogic extends EventEmitter {
 	 * @return object Combined object to return
 	 */
 	rainStatePayload(atTime, inMinutes, buienRadar, buienAlarm) {
-		var isRaining, probability, state;
+		var isRaining = ((buienRadar >= RAIN_LIGHT) || (buienAlarm >= RAIN_LIGHT));
+		var state = (isRaining === true) ? 'raining' : 'dry';
+
+		// Calculate probability
+		var probability = 0;
+		if (isRaining === true) {
+			if ((buienRadar !== -1) && (buienRadar >= RAIN_LIGHT)) {
+				probability+= 50;
+			}
 
-		if ((buienRadar >= RAIN_LIGHT) || (buienAlarm >= RAIN_LIGHT)) {
-			isRaining = true;
-			probability = (((buienRadar + buienAlarm) / 2) > RAIN_LIGHT) ? 100 : 50;
+			if ((buienAlarm !== -1) && (buienAlarm >= RAIN_LIGHT)) {
+				probability+= 50;
+			}
 		} else {
-			isRaining = false;
-			probability = (((buienRadar + buienAlarm) / 2) < RAIN_LIGHT) ? 100 : 50;
+			if ((buienRadar !== -1) && (buienRadar < RAIN_LIGHT)) {
+				probability+= 50;
+			}
+
+			if ((buienAlarm !== -1) && (buienAlarm < RAIN_LIGHT)) {
+				probability+= 50;
+			}
 		}
-		state = (isRaining === true) ? 'raining' : 'dry';
 
-		// debug
+		// Create message
 		var dt = this.iso8601dateTime(atTime);
 		var msg = (probability == 100) ? 'It ' : 'There is a ' + probability + '% chance that it ';
 		msg+= ((inMinutes > 0) ? 'will be' : 'is') + ' ' + state;
@@ -169,6 +181,16 @@ class WeatherLogic extends EventEmitter {
 			var atTime = new Date(after.getTime() + (inMinutes * MINUTE));
 
 			// Get forecasts for both providers
+			var buienradarPrecipitation = -1;
+			try {
+				buienradarPrecipitation = await this.Buienradar.getForecast(atTime);
+				buienradarPrecipitation = buienradarPrecipitation.mmh;
+			} catch(e) {
+				// In case this fails, we log it and use '-1' as value
+				this.emit('rain-error', 'Failed getting prediction for Buienradar for time ' + atTime.toISOString() + ': ' + JSON.stringify(e));
+				buienradarPrecipitation = -1;
+			}
+
 			var buienalarmPrecipitation = -1;
 			try {
 				buienalarmPrecipitation = await this.Buienalarm.getForecast(atTime);
@@ -179,19 +201,13 @@ class WeatherLogic extends EventEmitter {
 				buienalarmPrecipitation = -1;
 			}
 
-			var buienradarPrecipitation = -1;
-			try {
-				buienradarPrecipitation = await this.Buienradar.getForecast(atTime);
-				buienradarPrecipitation = buienradarPrecipitation.mmh;
-			} catch(e) {
-				// In case this fails, we log it and use '-1' as value
-				this.emit('rain-error', 'Failed getting prediction for Buienradar for time ' + atTime.toISOString() + ': ' + JSON.stringify(e));
-				buienradarPrecipitation = -1;
+			// In case we don't have a valid result at all, don't compare values
+			if ((buienradarPrecipitation === -1) && (buienalarmPrecipitation === -1)) {
+				continue;
 			}
 
-			var stateAtTime = this.rainStatePayload(atTime, inMinutes, buienradarPrecipitation, buienalarmPrecipitation);
-
 			// First loop we set the 'current' state
+			var stateAtTime = this.rainStatePayload(atTime, inMinutes, buienradarPrecipitation, buienalarmPrecipitation);
 			if (!tempState.hasOwnProperty('now')) {
 				tempState.now = stateAtTime;
 			}