re-merging location and Weather class