calculations fixed on weather tab

weather tab timeout half complete
Merge remote-tracking branch 'origin/master'