Added auto-zoom to current location or to whole map