Update ol and comply to new API

Please review and merge.

Note: there are more ol3 API changes to come.