Clean up code paths for weather based on manual or geolocation. Fixes issue 478.