Even more map ui js refactor
Merge branch 'map-ui' of github.com:osmlab/openstreetmap-website into map-ui