integration OL; refactoring of AngularJS app