Bug fixes when changing map type, allow user-controlled zooming