Added conditional zoom on map