Fix bug while choosing rainProb

Author: IagoLast

src/Prediction.js

@@ -52,22 +52,7 @@ function getCurrentTmp(data) {
 }
 
 function getCurrentRainProb(data) {
-  if (data[0]['_'] !== undefined) {
-    return data[0]['_'];
-  }
-  var hour = new Date().getHours();
-  if (hour <= 6) {
-    return data[3]['_'];
-  }
-  if (hour <= 12) {
-    return data[4]['_'];
-  }
-  if (hour <= 18) {
-    return data[5]['_'];
-  }
-  if (hour <= 24) {
-    return data[6]['_'];
-  }
+  return data.find(data => data['_'] !== undefined)['_'];
 }
 
 module.exports = Prediction;

test/index.test.js

@@ -12,6 +12,9 @@ describe('Meteosapi', () => {
       assert.notEqual(data.tomorrow, undefined, 'Data.tomorrow should be defined');
       assert.notEqual(data.next2, undefined, 'Data.next2 should be defined');
       assert.notEqual(data.forecast, undefined, 'Data. forecast be defined');
+      assert.notEqual(data.today.rainProb, undefined, 'Rain probability should be defined for today');
+      assert.notEqual(data.tomorrow.rainProb, undefined, 'Rain probability should be defined for tomorrow');
+      assert.notEqual(data.next2.rainProb, undefined, 'Rain probability should be defined for next2');
     });
   });
   it('should return the simplified wheather', () => {
@@ -23,6 +26,8 @@ describe('Meteosapi', () => {
       assert.notEqual(data.next2, undefined, 'Data.next2 should be defined');
       assert.equal(data.forecast, undefined, 'Data.forecast should be defined');
       assert.notEqual(data.today.rainProb, undefined, 'Rain probability should be defined for today');
+      assert.notEqual(data.tomorrow.rainProb, undefined, 'Rain probability should be defined for tomorrow');
+      assert.notEqual(data.next2.rainProb, undefined, 'Rain probability should be defined for next2');
     });
   });
 });