Rewrote the weather type determination