NAWQAAN-207

With NAWQAAN-234 bonus
This was actually just moved out of map.js and reformatted a bit, but I agree it can be changed to be a bit more clear.